Fix #118

Should fix the issue I opened.