bug fix... preventing from hitting the database desnecessary