patch from ticket #787