better support for *-prefix