#70 Forgot to remove a debug 'return'