Fix/issues/826