second attempt, fix white lens bug