Little fix during transition