Fixed period check
Merge branch 'hotfix/noperiod'