Virtual Pumps fixed

Bad logic for the virtual pumps fixed.