Hopefully fixed active using basename() on filename