Should fix #2