I believe this will also fix #10