Move effect callback to the maxifill

I think there are actually more conditions where we need to call. Needs fixme.