changing disableReturn functionality