Fixes #5195: Escape bundle_name correctly

:+1: