fixed service bug that contributes to #428 & #429