CON-2015 | Fix for Android <4.4