fix for issue402 patch