Fix boundaries as well