ClipsController Bug FIx