Added to issue #647