FIX: Fix butter

Ready for review/merge.