Fix issues 21, 23.