Fixed final bug