Fix for missing window and rescale causing problems