Partial fix for borders