Fix again for issue #569