let's be a little more safe in this