Switch to Nanoc Head and give their 'fixes' a chance.