bugfix and persistency 3