Fix issue #1314