Fix/issues/824