Bug fix #43