Bug fix #54