Little fix logic