Border fix on flip