better handling of non-standard chunk numbers