Fixed OverlayServiceCommon