Should fix clam mode. Wish I could test it here.