Bug fix #234