Extent fix (Issue #8)