Fixed issues for Android version below 4.3