Fixed minor bug caused by introduction of final modifier