#523: change order of os keys