Fix for first iteration