Redo lost fix
See 3b72bc73a4ae4a9bf82d44dbcef62d8c52f1f46e