bug fix "missing return statement"