bugfixes after switch to local attributes