Bug fix #20