Fix border transition