Fix bug (missing return in non-void function)