FIX: Better jack