Switched another prop resolution to ObjectSpace