Fix basename stack