Fixed errors for windows in case of maps