Bug fix #48