fixed issues in android L