I _thought_ there must be a better way to do that. :) PR?