Should fix #1