Fix last bug