FIX: proper finish