Should fix #2.