Fix for Multi-Window build