Fixed multiple return functions calls