bugfix and persistency 2