Fixes services bug