quickfix for issue #1