fix custeom helpers