enhancement for issue #469