Bug fix #165