Pretty sure it'll work this time. Closes #222.