Further work to fix #44