0.1.8: bug fixing