Fix for window size issue