Fixed border once again