Fix issues 30 31