Issue963 tomawac api

Hi Thierry,

Hereby the fixes for Issue 963 (issues that occur when running TOMAWAC twice using API)

Kind regards,

Alexander