Fixed a bug with the new compile time option for window numbers