private fix to issue #552