fix option parser for cluster mode