Fix last PR