Improving handling of objop