Temporary fix for TickHandlerMBS