Fix safety issue