#master: viewport fix