Optimized previous fixes