Fix issue 1414

See #1414