Fix to issue #1402