Condition on replacing object, bump v1.6