expiry date bug resolved