FIX #20 -

Fixed in previous version