fixed support for final classes