BAP-282 Manage hyphen specifically