Fixed issues #294