Fix for Android and PSSuite.