Nice idea, I just reverted this ugly solution :) May I create an issue for this one?