adding patch from KATTS-154