Bugfix in store clearing