Bug fix #183