Bug fix #4.