Minor bugfix - finish