Tweak boundary conditions to not exit