Added a return where needed