Fix issues 13, 12