Should fix #39
Should fix #38