System safe fix