Make last patch less gross. Volcane++