Fixed issue where service was continuing to run after app was closed