fix resolving order + fix object array bug