Fixed issue #327 (again)