Bugfix in expiration view