Solved border problem