Fixed issue #95. (Probably)