Fixes session/attributes merge