Old intermittent bug fixed