Added viewport fix