SERVICE FIXED. TODO: ERROR FIX