Bug fix #324