Remove final modifier to fix last commit