hopefully this makes #195 is done for good