Try replacing the extra plug in piece that the water trap connects to - sorry cant remember what its called, but seemed to fix similar faults for us.