Adding more condition to #10.