Safety bug fixed