fixed extension handling