Special service issue fix