Fix for multiplatform support - bcs. of WM is platform specific.