quickfix for issue #1461