fix for issue1