SCHEMA-519 Working on Windows