Fix Bugs for #55