Whoops, silly logic for service