Fixing for issue #1508