Added windows specific trick