oops :) but this was merged without a fix :P