Fixed crash caused by CoFH bucket change