Bug fix #22