Fix return correct values.