[FIX] Handled different offset problems reported by Kömpf