Фикс IllegalStateException
Merge branch 'develop'