Bugfix: crash introduced by wipe