Partial fix for 1212 - Only Windows