Bugs/1201

Fixed issue #1201