Remove redundant final
Fix silly bug