Made it even more bootstrap proof