Remember not to iterate the Boundaries, bodge fix for this added