Bug fix #6