Bug fix #5