temporary fix for service handlers