Final's bugfix