Fix problem infinity expire
Add penalty