Made it working with r6870 MTA browser branch