Rename autogenerated variable and add -1 margin for boarder again ;)