Added fix for shift-return.