Fix - small issue of replacing hyphen