This has finally been fixed in my main project. Thanks for all your
help guys.