Better check of expired or not. Closes #142