FIxed issue #1327