Should fix #12