fixed support for local mode