I'd swap to the YHM setup if it was me...