Yes, I like this just a little bit better :) - @slavafomin can you make this change?

Thanks!