Yet another CustomCell fix