Fix pump crash

Fix #1841