fixed repeating return - thanks to ZYNCMA