Fixed # (%23) Issues