Fixed issues #1.