Fixes return() borking the code