fix helper implementation