Done. I've also changed my IDE not to make such things final.