Fixed issues #7.