fix

FIX #015 10th JUNE 2017