added a safty net