Fixed silly bug + APK