#94

Seems to solve #99 as well. Or what do you say @cleberar38 ?