Bug fix #140