Fix property loading order