fixed bug issue1121
merged bug fixed issue1121