Same fix should be applied above