Applied fix by @JulienD