#67 Bug fixed