Bug fix #179