#WIN-502 bugofix