Support for issue #21