this will fix #114 if I find cases which justify uncommenting out the code