Fixing borders