Fix issue 482 in android project