Fixing extension parsing;