Multiple returns fix