@ryah indeed, and if you like my patch to fix this, it'll clock in at only 4 more lines. :)