created as issue #495