Bugfix/healthcheck