Fix for Account.setParent event trigger