Safety fix