Small patch to made on_return running for own Screen's