Fixing own mistakes