fixed issue when no context specified