Safer fix for latest commit