adding some viewport hack for now