"skip" calculation fixed