added temporary workaround for the flask client