Should fix #7 (v3.3)