Now also works without params