Fixed info handling