added fix for issue1