do some tweaks to prevent potential self-reading