Fix for zucchini