Fix incorrect layout on Windows (#653).