Added env based strange solution