Added minor checking