Bug fix #574