Bug fix, add filename as feature