#287 #583 Fix hard return bug