fake-9999 fix according git changes