Bugfix solution and Argus Plugin