Bug fixing

* Fixed  #36