Bug fix #499