Fix return value. Fixed #1