Fix issue with black state borders