Same fix for behavior