another patch from Thomas