Actually return the correct values.