Hopefully Fixed Border