Max modified fixed #1