Bug fix #109