This should fix #93. Closes #93.