Fixing but with extensions