Fix pump rollover issue