Should fix #58