isset check added