iswm/iswmcs fix