more liberal extension handling