Fix return value type