Bug fix for tenses