BuildApk fix