Essential fix #248.