Bug fix #150