Fix catch 22