Fixed bad service saving