Fix #171 - now sets fit to systems window