added a return on line 46