Should fix #1.