Fix properties resolving order.