Fixed issues #37, #38..