fixed to support quick_utils