Bug fix #10