Alpha 2: fixing regression