Support for issue #25