Fixed Android Studio / IntelliJ support