Fixed border issue