fixes for issue1