Made fields final, fixes #215