Bug fix #4