fix for patch-1