Last commit uses the wrong viewport. More testing is needed to find the correct one.