Fix issue #331 (just workaround)