Should fix #28