fixed the $,% bug