fix for issue #556

PR for issue #556 fix