Fix/823

Fixed issue #823