Work on #249 issue1