fixed : nil condition