shortened name and added missing check