BugFix list store / update