Added support for issue #5