-Fix: that return shouldn't have been there...