Refs #27. Adding logic to correct OS issue.