Final class fixed