adding more verification to avoid issues