Updated #32 @m-iancu @eluzhnica please test again