Now passes lint