Fix Grape API