Possible fix for double-parsing bug