Work on fixing #13.