Added safer values