better handling of extent change