simple copy and ad-hoc fix for stripprefix issue