Fix border backgrounds are set to null