Fix issues 24, 23