Fixed issues #37 & #38, fixed in use field