Bug fix #57