quickfix for issue #28