Fix issues/1