SLT-498 Fixed intellij refactoring failure