Bug fix #21