Fix cross tab loading issues, fixes #1