fix #286: problem with 'Return'