#1916 - Forgot the expired status
#1916 - Helps if the expired is in the right condition