Fix boundaries