fixing some helpers