Fixed #86 & Fix 84
Fixed #86 & Fix 84