Fixed to get proguard working