some tweaks to minimize #5