Should fix #45