Fixed border rendeing issue