Should fix #10