Should fix #53