Changes for issue #467