981770-69264386 Build proper handling for infinite boundary conditions