Bug fix #169