diff --git a/project/jni/application/setEnvironment.sh b/project/jni/application/setEnvironment.sh
index c340132f3..2d97ea1e1 100755
--- a/project/jni/application/setEnvironment.sh
+++ b/project/jni/application/setEnvironment.sh
@@ -14,9 +14,9 @@ LOCAL_PATH=`cd $LOCAL_PATH && pwd`
 
 SCRIPT=setEnvironment-r4b.sh
 CRYSTAX_WCHAR=
-if [ -n "`echo $NDK | grep 'android-ndk-r5'`" ]; then
+if [ -n "`echo $NDK | grep 'android-ndk-r[56]'`" ]; then
 	SCRIPT=setEnvironment-r5b.sh
-	if [ -n "`echo $NDK | grep 'android-ndk-r5-crystax-1.beta3'`" ]; then
+	if [ -n "`echo $NDK | grep 'android-ndk-r5-crystax-1'`" ]; then
 		CRYSTAX_WCHAR=1
 	fi
 fi
diff --git a/project/jni/application/src b/project/jni/application/src
index c5a9d291d..8193e5e18 120000
--- a/project/jni/application/src
+++ b/project/jni/application/src
@@ -1 +1 @@
-commandergenius
\ No newline at end of file
+vcmi
\ No newline at end of file