Should fix #13