Fixed issues #134