Fixed return from non-void function