Bug fix #2.