Added isset check