Added correction for issue #559