Final hack... it works at least.