Fix cmd-return bahaviour

Fix #179