Fixing MAC form and index