Prepare nametime fix