Should fix #13.