BUG FIX: Windows directory handling -II.