Android Service Fix