changed a bit trying to fix the android bug