Fixed issues #866 and #868