Fix #1 missing return at end of function