Bug fix #1