Bug fix #26