Fixed to pass correct settings