Fixed bug related to skipping initial windows