Fix #1479 - r2 -- respects the other parameters now