Fix border problem