this should be fixing #100