Fix viewport try 2