fix switching between master and clone resources