Made it more safe