Fixed (comment: Make class final)