Fixed #9
Should fix #10