Fixed returned values