Fixed no re-entry