Bugfix/express version