fixed: return from non-void functions